From: smh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Date: Fri, 24 Sep 2004 17:08:32 +0000 (+0000)
Subject: bitkeeper revision 1.1159.91.1 (41545490klPYsVC65RXTsROARJj8bw)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~571^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=2719066938bc9d7c56074e161d959cb309f291f5;p=xen.git

bitkeeper revision 1.1159.91.1 (41545490klPYsVC65RXTsROARJj8bw)

build 2.4 w/out blkdev frontend (e.g. for dom0)
---

diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
index 7474e71fb4..7f1b4a98fb 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
+++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
@@ -1,8 +1,8 @@
 
 O_TARGET := drv.o
 
-subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend
-obj-$(CONFIG_XEN_NETDEV_FRONTEND)    += frontend/drv.o
+subdir-$(CONFIG_XEN_BLKDEV_FRONTEND) += frontend
+obj-$(CONFIG_XEN_BLKDEV_FRONTEND)    += frontend/drv.o
 
 subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
 obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o
diff --git a/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
index a7f03c0fd5..605debf128 100644
--- a/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
+++ b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
@@ -1626,7 +1626,7 @@ int __init blk_dev_init(void)
 	jsfd_init();
 #endif
 
-#if defined(CONFIG_XEN)
+#if defined(CONFIG_XEN_BLKDEV_FRONTEND)
     xlblk_init();
 #endif